Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement/http_req #299

Merged
merged 4 commits into from
May 5, 2014
Merged

Enhancement/http_req #299

merged 4 commits into from
May 5, 2014

Conversation

arunpandianp
Copy link
Contributor

#81

@hellais
Copy link
Member

hellais commented Apr 30, 2014

This is very good work! I will add a couple of comments inline.

@@ -314,6 +325,10 @@ def errback(failure, request):
self.addToReport(request, failure_string=failure_string)
return failure

if use_tor:
state = config.tor_state
state.add_stream_listener(StreamListener(request))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably needs to be conditional as it is possible that the user has configured their ooni-probe without a control port and tor was not started by us. In that case we can't do very much, but we should at least not fail badly.

if use_tor:
state = config.tor_state
if state:
state.add_stream_listener(StreamListener(request))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Condition added

@hellais
Copy link
Member

hellais commented May 5, 2014

Ok this looks good, merging, thanks :)

hellais added a commit that referenced this pull request May 5, 2014
@hellais hellais merged commit d17fe25 into ooni:master May 5, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants